fix: restore bin/docker-build functionality
#14698
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this helper script wrapping docker is used by various scripts in the development workflow. in #14360, we removed the `cli-bin` image from our published artifacts. Signed-off-by: katelyn martin <[email protected]>
this commit removes mention of docker from this comment. there is no longer an equivalent `docker-build-cli-bin` script, so this is the way that we build the cli binary. Signed-off-by: katelyn martin <[email protected]>
this commit removes mention of the cli from our `bin/docker-build` script. in #14360, we removed the cli image from our published artifacts. moreover, invoking `bin/linkerd` will call `bin/build-cli-bin`. so, this commit removes both calls, to the now deleted `bin/docker-build-cli-bin` script, as well as the `bin/build-cli-bin` script. this lets the `bin/docker-build` script focus solely on docker images. Signed-off-by: katelyn martin <[email protected]>
this image is used within CI, and broadly as a "layer" to place the cli binaries in a final image. the cli image itself however, is not currently intended for use directly via `docker build`, and will consequently yield an error response if built directly. this commit adds a comment providing some information about this. see #14360 for more. Signed-off-by: katelyn martin <[email protected]>
cratelyn
changed the title
bin/docker-build functionality
sfleen
approved these changes
Nov 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this branch makes changes to scripts in the
bin/directory, torestore the end-to-end local development workflow described in
BUILD.mdhere:https://github.com/linkerd/linkerd2/blob/main/BUILD.md#comprehensive
now that we no longer include a
bin-cliin our published artifacts,we can remove that image from the list of images that the
_docker.shhelper script is aware of. this means we now refrain from (a)
building the image when
bin/docker-buildis run, and (b) loading theimage when
bin/image-loadis run.some related comments are updated in this branch, while we are here.
refactor: remove
cli-binfrom_docker.shimagesthis helper script wrapping docker is used by various scripts in the
development workflow.
in chore(ci)!: update CLI build pipeline #14360, we removed the
cli-binimage from our published artifacts.Signed-off-by: katelyn martin [email protected]
nit(bin): update
build-cli-bincommentthis commit removes mention of docker from this comment. there is no
longer an equivalent
docker-build-cli-binscript, so this is the waythat we build the cli binary.
Signed-off-by: katelyn martin [email protected]
fix(bin): remove cli from
bin/docker-buildthis commit removes mention of the cli from our
bin/docker-buildscript.
in chore(ci)!: update CLI build pipeline #14360, we removed the cli
image from our published artifacts. moreover, invoking
bin/linkerdwill call
bin/build-cli-bin.so, this commit removes both calls, to the now deleted
bin/docker-build-cli-binscript, as well as thebin/build-cli-binscript. this lets the
bin/docker-buildscript focus solely on dockerimages.
Signed-off-by: katelyn martin [email protected]
docs(cli): a comment about cli image
ENTRYPOINTthis image is used within CI, and broadly as a "layer" to place the cli
binaries in a final image.
the cli image itself however, is not currently intended for use directly
via
docker build, and will consequently yield an error response ifbuilt directly.
this commit adds a comment providing some information about this.
see chore(ci)!: update CLI build pipeline #14360 for more.
Signed-off-by: katelyn martin [email protected]